git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Instead of rebasing, etc....?

From
Raja R Harinath <harinath@hurrynot.org>
Date
May 10, 2010, 08:03 UTC
Message-ID
<87ljbsdvzp.fsf@hariville.hurrynot.org>
In-Reply-To
<loom.20100507T004928-336@post.gmane.org>
Hi,
Dave Abrahams <dave@boostpro.com> writes:
Show 15 quoted lines
> Dave Abrahams <dave <at> boostpro.com> writes:
>
>> I often find myself pursuing a development branch ...
>
> Sorry, my ASCII art was messed up in the previous message.  
> Here's what I meant:
>
> o-o-o-o origin/dev
>    \
>     o-o-o dev
>
>
> o-o-o-o - -o origin/dev dev
>    \      / 
>     o-o-o 
You can use the 'ours' merge strategy.
On the 'dev' branch, you do
   git merge -s ours origin/dev

Now 'origin/dev' is a parent of the new 'dev', while the tree contents haven't changed. You can now push 'dev' back to origin without any hassles.

- Hari
Previous: Dave AbrahamsNext: Ramkumar Ramachandra
Message 3 of 4 in “Instead of rebasing, etc....?”
  1. Dave AbrahamsMay 6, 2010
  2. Dave AbrahamsMay 6, 2010
  3. Raja R HarinathMay 10, 2010
  4. Ramkumar RamachandraMay 10, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.