On 08/04/2011 06:25 AM, Sanne Grinovero wrote: >> I just pulled another change and got another merge. I rebased my repo >> (git pull --rebase upstream master) against master first but it looks >> like I might need to delete my repo and recreate it (cheap way to >> combine parent 2d52494b90507ba676ef + parent 72078ade4d1f293d5c49). >> >> https://github.com/hibernate/hibernate-core/commit/cefa777c0089eac7456d50e866eaf612585c905f > > Hi Scott, from the network graph it looks like your commit was fine > and should have been fast-forwarded, so I don't think there's > something wrong with your repository. > > Are you using the github web ui to handle the pull request? If so, > that one is always going to introduce a merge commit, so we avoid it.
Yes, I used the github web ui. I won't be pressing that button a 3rd time. > > In other cases if you think your local repository is not in sync > anymore, you don't need to throw it away, just delete your master > branch, fetch from upstream and then look at the commit id of the > upstream master (can find it on github too), and create it as your > local branch Interesting, thanks for the tip. When I first started using git, I ended up with an abused master branch. Dropping/recreating the repo, worked around that. I like your way better. > > for the current state assuming you're in a different branch and you > deleted master: > git checkout -b master cefa777c0089eac7456d > > I just had to do this myself since it seems my master history diverged > again from upstream :( > > Cheers, > Sanne _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
