ahendy/css3patternz — comment on commit 8a8c0cd0d86ec4a7e06bc8485052ca0c56a769cf
File:  line 0
By ahendy:

Thanks Mohsen. Resolving conflicts is not a big deal. It's how Git makes you commit before updating that was confusing. I think I figured out how they want me to handle conflicts. I end up committing twice. Once my changes and then the resolved conflict changes. What made this difficult is you rewrote and committed the code I had started before showing you yesterday. So I had started the same lines before the update came in. Anyway.. It's all good.

Thanks.

Sent from my iPhone

On Oct 22, 2011, at 12:26 PM, Mohsen wrote:

> Yes, it's how Git works. It's not the github.app's specific way. You should
> commit your changes first OR undo your code changes if you want to see
> repository first. In most cases committing changes is the best way. Even
> there was a conflict you can resolve it after you synced.
> Please note that Git looks at lines of code not files. So if you're making
> changes in same line of code that repository have another commit after your
> previous sync then shows a conflict. So if you are adding a new function or
> something it's best to add it to end of the file to prevent conflict.
>
> Resolving conflicts sometimes getting painful. I know. The trick I use is
> going to github.com and seeing what is changed there and comparing my code.
> Sometimes I edit the code via github.com that is a shortcut!
>
>
> On Sat, Oct 22, 2011 at 11:59 AM, Andrew Henderson <
> reply@reply.github.com>wrote:
>
>> Mohsen,
>> When I click "Sync Branch" it says I have to commit my changes first. The
>> app is a pain in the dick.
>>
>> On Sat, Oct 22, 2011 at 10:35 AM, Mohsen <
>> reply@reply.github.com>wrote:
>>
>>> Andrew, it always happens because you or I don't get the latest before
>>> start
>>> working.
>>> Yesterday and today I didn't have any commit so if you got latest before
>>> start coding you wouldn't have any conflict.
>>> Going to see what's changed?
>>>
>>> Thanks for contributing
>>>
>>> On Sat, Oct 22, 2011 at 9:58 AM, Andrew Henderson <
>>> reply@reply.github.com>wrote:
>>>
>>>> I think I might be alright. I just added the freshly checked out files
>> to
>>>> my original commit and Git seems to have sorted it out. I will wait
>> until
>>> I
>>>> have new additions to files to push/sync. I believe this is how they
>>> would
>>>> like one to handle this scenario.
>>>>
>>>> --
>>>> Reply to this email directly or view it on GitHub:
>>>>
>>>>
>>>
>> https://github.com/ahendy/css3patternz/commit/8a8c0cd0d86ec4a7e06bc8485052ca0c56a769cf#commitcomment-668379
>>>>
>>>
>>>
>>>
>>> --
>>> Mohsen Nabiloo Azimi
>>>
>>> --
>>> Reply to this email directly or view it on GitHub:
>>>
>>>
>> https://github.com/ahendy/css3patternz/commit/8a8c0cd0d86ec4a7e06bc8485052ca0c56a769cf#commitcomment-668418
>>>
>>
>>
>>
>> --
>> Andrew Henderson
>> Projects |
>> LinkedIn|
>> Facebook |
>> Twitter
>>
>> --
>> Reply to this email directly or view it on GitHub:
>>
>> https://github.com/ahendy/css3patternz/commit/8a8c0cd0d86ec4a7e06bc8485052ca0c56a769cf#commitcomment-668492
>>
>
>
>
> --
> Mohsen Nabiloo Azimi
>
> --
> Reply to this email directly or view it on GitHub:
> https://github.com/ahendy/css3patternz/commit/8a8c0cd0d86ec4a7e06bc8485052ca0c56a769cf#commitcomment-668512