On zondag 13 oktober 2019 22:57:20 CEST Albert Astals Cid wrote:
> I find the merge behavior to be not what we've been doing in phabricator so
> given the idea is to maintain our workflows i'd appreciate if we can agree on
> continue doing the same.
>
> https://docs.gitlab.com/ee/user/project/me
On Mon, Oct 14, 2019 at 1:42 PM Aleix Pol wrote:
>
> On Sun, Oct 13, 2019 at 10:57 PM Albert Astals Cid wrote:
> >
> > I find the merge behavior to be not what we've been doing in phabricator so
> > given the idea is to maintain our workflows i'd appreciate if we can agree
> > on continue doing
Yes, please, pretty please with cherry on top. :)
Regards,
-Johan
On Sun, Oct 13, 2019 at 10:57 PM Albert Astals Cid wrote:
>
> I find the merge behavior to be not what we've been doing in phabricator so
> given the idea is to maintain our workflows i'd appreciate if we can agree on
> continu
On Sunday, October 13, 2019 1:57:06 PM EDT Ben Cooksley wrote:
> On Mon, Oct 14, 2019 at 6:06 AM Allen Winter wrote:
> >
> > or maybe renamed?
>
> Hi Allen,
>
> >
> > How do I find out if there are any GHNS for KOrganizer.
> > The Import->GHNS menu in KOrganizer starts and I see the import dialo
Hi,
just asking in case I didn't get it.
I branch off of master and do a few commits in that new branch.
If I now merge the branch back to master and master had not seen any
commits in between, it's just relocating the master "tag" and all is fine.
If however, master had seen commits as well,
On 14.10.2019 21:22, Frederik Schwarzer wrote:
Hi,
just asking in case I didn't get it.
I branch off of master and do a few commits in that new branch.
If I now merge the branch back to master and master had not seen any
commits in between, it's just relocating the master "tag" and all is fine
On 14.10.2019 21:22, Frederik Schwarzer wrote:
> If however, master had seen commits as well, fast-forwarding is
> performing a rebase ... is that correct?
The workflow would be: whenever master is updated, you rebase your
local feature/work branch and force-push to the remote copy of the
feature/
