@Samuel Lijin
I tried now and I get:
"merge: branch_name
- not something we can merge".
Maybe that is something easy to fix but currently I am using a
workaround script so I am not putting any more effort at this at the
moment.
@David Aguilar
That's true but the trailing slash is already there.
On Tue, Feb 07, 2017 at 08:59:06AM -0600, Samuel Lijin wrote:
> Have you tried using (without -s subtree) -X subtree=path/to/add/subtree/at?
>
> From the man page:
>
> subtree[=]
>This option is a more advanced form of subtree
> strategy, where the strategy
>
Have you tried using (without -s subtree) -X subtree=path/to/add/subtree/at?
>From the man page:
subtree[=]
This option is a more advanced form of subtree
strategy, where the strategy
makes a guess on how two trees must be shifted to match
with each other
Following the instructions here:
https://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging
will lead to an error.
In particular, if the subtree is merged and then updated, this command
that is supposed to update the local subtree fails with a fatal:
refusing to merge unrelated histories error.
$
Hi Stavros,
On Mon, 6 Feb 2017, Stavros Liaskos wrote:
> Please check this issue for a description of the bug:
> https://github.com/git/git-scm.com/issues/896#issuecomment-277587626
Just an observation from my side: if I see a request for help on this
mailing list where the sender merely
Hi,
Please check this issue for a description of the bug:
https://github.com/git/git-scm.com/issues/896#issuecomment-277587626
Regards,
Stavros
6 matches
Mail list logo
