Re: [git-users] Locking master branch

[Konstantin Khomoutov]

On Wed, Aug 30, 2017 at 01:43:58AM -0700, Prasanth Damodharan wrote:

> In GitHub, Is there a way to lock master branch and limit access based on 
> user ids?

This list discusses Git -- and SCM/VCS system -- and has nothing to do
with Github -- a Git hosting solution.

Still, [1] looks like what you need.

1. https://help.github.com/articles/about-branch-restrictions/

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Issues with wrong merge to master

[Michael]

On 2017-08-30, at 1:30 AM, Prasanth Damodharan  
wrote:

> I am facing below merge issue while using Git. Please let me know if you have 
> suggestions on how to resolve it
> 
> 1. Feature branch (DEV_FEATURE1) got merged to master branch by mistake and 
> changes were reverted from master
> 2. DEV_FEATURE1 has files that are not present in master.
> 3. After reveral when master is merged back to DEV_FEATURE1, all files that 
> are not present in master is getting deleted and many files are conflicted.
> 
> Please let me know if you have faced similar issue and how to get master back 
> to normal.

This sounds like merge's behavior of "We only look at the tips and changes 
since merge_base". You merged feature to master, deleted stuff in master 
(reverted it out of master), and now are merging master to feature, causing the 
master's changes to propagate to feature.

If that's the problem, I know that there's a way to merge where you say "Trust 
everything we have, discard everything from the other guy, just reset merge 
base and ignore that code completely". But what that is, I don't know.


---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Bringing back botched history in a rebaseable state

[Marc Haber]

On Mon, Aug 28, 2017 at 10:32:36AM -0700, Michael wrote:
> You might try 'imerge'.
> 
> Git-imerge basically can construct a rebase, and it actually looks at all the 
> commits along the way, rather than only the heads and merge-base.

That one here?

https://github.com/mhagger/git-imerge

Greetings
Marc
-- 
-
Marc Haber | "I don't trust Computers. They | Mailadresse im Header
Leimen, Germany|  lose things."Winona Ryder | Fon: *49 6224 1600402
Nordisch by Nature |  How to make an American Quilt | Fax: *49 6224 1600421

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Locking master branch

[Prasanth Damodharan]

In GitHub, Is there a way to lock master branch and limit access based on 
user ids?

Thanks!

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] Issues with wrong merge to master

[Prasanth Damodharan]

I am facing below merge issue while using Git. Please let me know if you 
have suggestions on how to resolve it

1. Feature branch (DEV_FEATURE1) got merged to master branch by mistake and 
changes were reverted from master
2. DEV_FEATURE1 has files that are not present in master.
3. After reveral when master is merged back to DEV_FEATURE1, all files that 
are not present in master is getting deleted and many files are conflicted.

Please let me know if you have faced similar issue and how to get master 
back to normal.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] How to Move from Dropbox to Git

[Konstantin Khomoutov]

On Tue, Aug 29, 2017 at 07:07:47PM -0700, Ray Joseph wrote:

> Our team is using Dropbox and we want to change to Git.  I have seen many 
> articles on how to use them together, but not how to transition.  Is it 
> possible to capture the Dropbox versioning over to a new Git repo?

DropBox has a "web API" available which can be used to retreive the list
of revisions for a particular file, and obtain each of these revisions.

So you could code up a tool which, given an URL of a project's root
folder on your DropBox account, would list the folder's contents then
walk the revisions of each file, and download them.  The simplest way to
shovel them to a Git repo is, IMO, appending them to a file formatted to
the expectations of the `git fast-import` command [1].

I'm not well-versed in DropBox semantics so I don't know whether DropBox
supports atomic updates of several files at once or each update
operation always happens on a single file (and so the commits you'll be
synthesizing for a Git repo will also be single-files).  You'd also need
to track renames (in Git, a rename is deletion of a file from its old
location and addition of it at a new one -- that is, no special "rename"
operation is supported).

I'm pretty sure there should exist ready-made libraries for popular
scripting languages to make use of DropBox API.

1. https://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.