murad073 / SmartAccount

This project is for small business accounting system
http://smartaccount.dyanit.com/
11 stars 3 forks source link

Download changes #6

Closed jakaria42 closed 12 years ago

jakaria42 commented 12 years ago

I don't see any 'Fork Queue' tab in the 'Networks' tab.

How am supposed to take your changes to my repo 'jakaria42/SmartAccount'?

murad073 commented 12 years ago

I am not getting the tab in my account too. I dont understand what is happening. You choose my branch directly to get my changes.

steps -

  1. In your local git gui, add a remote named murad073 (location is : https://murad073@github.com/murad073/SmartAccount.git)
  2. use facth from murad073
  3. if you get some changes from me, try merge.

I think this will work...

I still didnt get a good way to resolve conflict..., in case of conflict i dont know what to do..

jakaria42 commented 12 years ago

I tried it, at first time, it showed me this message: From https://github.com/murad073/SmartAccount