Changes

Jump to navigation Jump to search
1,208 bytes added ,  19:30, 28 April 2013
→‎Merging Topic Branches: http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg32305.html
Line 401: Line 401:  
'''git merge newidea'''
 
'''git merge newidea'''
    +
=== Resolving Conflicts ===
 +
Basically, you have to resolve your conflicts at that point if you want to keep your commit. Even if you merged your changed branch (e.g. with git pull) rather than rebasing it you'd get the conflicts.
 +
 +
* git status            to check which files are in conflict.
 +
* git add <files>        to register the state you want them to have.This may include cleaning out merge conflict from text files before adding them.use git checkout local-weather -- the/file to restore your version and git checkout master -- the/file to restore the upstream version.
 +
* git rebase --continue  to continue the rebase.
 +
 +
For your own local work I recommend committing it in small logical units - that makes it easier to use git rebase --skip to remove local edits when
 +
they become obsolete due to upstream updates.
 +
 +
Btw. if you don't have any particular need to checkout the master branch just
 +
<pre>
 +
  git fetch origin/master
 +
  git rebase origin/master
 +
</pre>
 +
on the local-weather branch will do.
 +
 +
But do remember to use origin/master rather than just master in git diff and git checkout -- some/file commands in that case, since your local
 +
master branch will not be updated by fetch and rebase.
    
=== Keeping topic branches in sync with upstream ===
 
=== Keeping topic branches in sync with upstream ===

Navigation menu