Not yet; Chris is working on a fix for a problem I noticed this morning.




On Mon, Nov 25, 2013 at 3:11 PM, Demian Katz <demian.katz@villanova.edu> wrote:

Yeah, I’ll likely rebase the whole thing when it goes to master anyway (to merge it all to one commit, etc.), so you can save yourself some trouble by waiting.

 

On a related note, have you been able to merge in Chris’ additions yet?

 

- Demian

 

From: anna headley [mailto:anna3lc@gmail.com]
Sent: Monday, November 25, 2013 3:12 PM
To: Demian Katz
Cc: vufind-tech@lists.sourceforge.net
Subject: Re: [VuFind-Tech] git question

 

Okay, thanks! I will probably just hold off then. Glad I consulted first.

 

On Mon, Nov 25, 2013 at 1:57 PM, Demian Katz <demian.katz@villanova.edu> wrote:

What you might want to do is rebase your branch on top of current master instead of merging master into the branch…  then force git to overwrite the branch when you push to GitHub. This sort of behavior is VERY BAD for a shared branch that people are actually using, since it messes up clones in a nasty way, but for pull requests, I don’t think it’s a bad practice, since these aren’t really “working branches” so much as shared change sets… if that makes any sense.

 

In any case, I think if you do a merge as you originally suggested, the pull request should still be okay… but it may become less readable, and merging it back into master may become more difficult.

 

- Demian

 

From: anna headley [mailto:anna3lc@gmail.com]
Sent: Monday, November 25, 2013 1:55 PM
To: vufind-tech@lists.sourceforge.net
Subject: [VuFind-Tech] git question

 

I'd like to pull vufind-org master into my current branch. When I then push back to mt branch on github, will that mess with my outstanding pull request in any way?

I don't think it will because git is pretty smart about keeping track of the commits themselves, as opposed to some chronological conception of the state of a project. But confirmation would be comforting.

 

Thanks,
Anna