On Fri, Nov 19, 2010 at 12:31:14PM +, Michael Meeks
michael.me...@novell.com wrote:
We should be using 'git merge' unless it is for a purely local branch
that we are rebasing - surely ? at least - encouraging wider use of
re-base is likely to burn time and motivation - that thing
On Fri, 2010-11-19 at 12:31 +, Michael Meeks wrote:
On Thu, 2010-11-18 at 08:28 -0500, Kohei Yoshida wrote:
Now that we promote the concept of feature branches, I hope we can
revert this.
We should be using 'git merge' unless it is for a purely local branch
that we are rebasing
On Fri, 2010-11-19 at 12:31 +, Michael Meeks wrote:
We should be using 'git merge'
So, part of the problem was that I was always using git pull, even where
git merge would've been appropriate.
To be honest, I didn't even know of 'git merge' until now. I always
thought pull was
On Fri, Nov 19, 2010 at 11:03:21AM -0500, Kohei Yoshida kyosh...@novell.com
wrote:
So, part of the problem was that I was always using git pull, even where
git merge would've been appropriate.
To be honest, I didn't even know of 'git merge' until now. I always
thought pull was merge in git
On Thu, 2010-11-18 at 10:30 +0100, Miklos Vajna wrote:
On Wed, Nov 17, 2010 at 08:28:36PM -0500, Kohei Yoshida kyosh...@novell.com
wrote:
3) When creating a feature branch, by default, the autosetuprebase
option is set to true, which forces rebase when pulling from the master
branch even
Hi Kohei, Miklos,
On 2010-11-18 at 08:28 -0500, Kohei Yoshida wrote:
And continuously pulling from the master branch is very common when you
are in a long-term feature branch, and messing up the branch history is
the last thing you want to see happen while the branch is still being
On Thu, Nov 18, 2010 at 08:28:36AM -0500, Kohei Yoshida kyosh...@novell.com
wrote:
Also, I have no doubt that some of us will start using feature branches
to share development with others, and if my understanding is correct
(which it may not be) rebasing locally and pushing to the remote
On Thu, Nov 18, 2010 at 04:52:56PM +0100, Jan Holesovsky ke...@suse.cz wrote:
Sorry for that, I did not see all the consequences :-(
It really sounds as reverting is the safer choice - Miklos, can you
please do that?
I just did so in the libreoffice-3-3 branch. If it's urgent, I can
