The former will keep the version of the file that you merged in, and the other will keep the original one we had. According to the git checkout manpage, there’s a -theirs and -ours options on the command. Merging and conflict resolution ¶ resolving merge conflicts ¶ git mergetool Whipe out all changes in working directory, and replace with HEAD revision git reset -hard HEAD Ĭreate git ignore: git-svn show-ignore >. Here the subrepo drupal is used in the example: git svn clone -T trunk/drupal -t tags/drupal -b branches/drupal. It is important to specify the sub folders in trunk branches and tags!! Svn commit => git svn dcommit (will commit latest commits in git to the svn repositoryĬlone a svn sub-repository. ![]() Reference on git/svn command equivalents ¶
0 Comments
Leave a Reply. |