Am Mittwoch, 8. Januar 2014, 19:29:48 schrieb KP Kirchdörfer: > Hi Yves; > > Am Mittwoch, 8. Januar 2014, 14:31:13 schrieb Yves Blusseau: > > Hi all, > > i was forced to rewrite history of the last commits in the master branch. > > So you need to update your local master branch. You must check that you > > are no local changes pending in your master branch (use git log) If you > > have somes changes copy your master branch to another name like > > master-new with the command: git branch master-new master > > > > The really work to sync your local master branch with the central > > repository is git checkout master > > git fetch —all > > git reset —hard master origin/master > > I see: > > #git checkout master > Switched to branch 'master' > Your branch and 'origin/master' have diverged, > and have 5 and 4 different commits each, respectively. > > # git fetch --all > Fetching origin > > #git reset --hard master origin/master > fatal: Cannot do hard reset with paths. > > > Any idea what's goig wrong? > > thx kp > > > Now if you have create a master-new branch (describe above) because you > > have some uncommit change that you « save » in master-new branch try to > > rebase with the new master branch: git checkout master-new > > git rebase origin/master > > and then check that all the new commits are needed (you can use the > > command > > git log master..master-new) You can use the rebase -i origin/master > > command > > if you want to delete or squash some commits. > > > > When you think it’s good to move your uncommit changes to master: > > git checkout master > > git pull —rebase > > git merge —ff-only master-new > > and you can then delete the master.new branch: git branch -d master.new > > > > Creating the master.new branch it’s ONLY necessary if you have uncommit > > changes in your branch. > >
Deleted master-new and redid and the errors went away (ONLY necessary) - probably I had no uncommitted changes... and that's been the cause... thx again for taking care of it kp ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
