Re: [git-users] Beginner: delete 2 revisions

2017-07-21 Thread Konstantin Khomoutov
On Tue, Jul 11, 2017 at 10:23:12AM -0700, DynV Montrealer wrote: > I'd like to delete revision 2 & 5 on > http://gist.github.com/WilliamCQ/4d734bf3e7c3ab59b08c949f1ab673d7 and have > no idea how to proceed by command line and the web interface won't let me > do it; it's support assured me it

Re: [git-users] Re: pull merge vs a local merge, what's different?

2017-07-21 Thread Konstantin Khomoutov
On Fri, Jul 21, 2017 at 05:46:44AM -0700, Jon Erickson wrote: > > To start, the user that generated this error was advised to backout the > > resulting munge and use a standard merge to fix his problems. Following > > standard merging practices fixed his problems but his original approach had

[git-users] Re: pull merge vs a local merge, what's different?

2017-07-21 Thread Jon Erickson
On Thursday, July 20, 2017 at 7:11:03 PM UTC-4, Jon Erickson wrote: > > To start, the user that generated this error was advised to backout the > resulting munge and use a standard merge to fix his problems. Following > standard merging practices fixed his problems but his original approach

Re: [git-users] Re: Malicious Coder

2017-07-21 Thread Nelson Efrain A. Cruz
If you don't trust him don't give him direct access to the repo. Instead you should accept changes that he send to you in the form of patches or changes in a fork (a fork of the repo) through merge or pull requests[1], the last depends on how you share your repo. This will allow you to do a code

Re: [git-users] Beginner: delete 2 revisions

2017-07-21 Thread Michael
On 2017-07-21, at 10:09 AM, Konstantin Khomoutov wrote: > On Tue, Jul 11, 2017 at 10:23:12AM -0700, DynV Montrealer wrote: > >> I'd like to delete revision 2 & 5 on >> http://gist.github.com/WilliamCQ/4d734bf3e7c3ab59b08c949f1ab673d7 and have >> no idea how to proceed by

Re: [git-users] Beginner: delete 2 revisions

2017-07-21 Thread DynV Montrealer
I wanted to keep the same file path and delete 2 revisions. I already put the file path some places and I rather kept it than delete the revisions. On Fri, Jul 21, 2017 at 7:43 PM, Michael wrote: > > On 2017-07-21, at 10:09 AM, Konstantin Khomoutov wrote:

Re: [git-users] pull merge vs a local merge, what's different?

2017-07-21 Thread Michael
On 2017-07-20, at 4:11 PM, Jon Erickson wrote: > To start, the user that generated this error was advised to backout the > resulting munge and use a standard merge to fix his problems. Following > standard merging practices fixed his problems but his original approach

Re: [git-users] pull merge vs a local merge, what's different?

2017-07-21 Thread Michael
On 2017-07-20, at 4:11 PM, Jon Erickson wrote: > To start, the user that generated this error was advised to backout the > resulting munge and use a standard merge to fix his problems. Following > standard merging practices fixed his problems but his original approach

Re: [git-users] Re: Repository corruption ...

2017-07-21 Thread Konstantin Khomoutov
On Wed, Jul 19, 2017 at 10:32:38PM -0700, Deepti Dua wrote: > i am still facing error after changing permission > > nitialized empty Git repository in /home/sushmitha/RBTool/test/lte_epc/.git/ > cm_ltepc@gurux's password: > error: pack-objects died of signal 9 > error: git upload-pack: