Open nishanthkarthik opened 8 years ago
I think I messed up the repository. I deleted the files from commits by others while trying to revert back to recover some files I deleted. I'm new with this thing. Can someone fix this please.
On Tue, Oct 6, 2015 at 9:45 PM, Karthik Nishanth notifications@github.com wrote:
Please create folders for your own modules. Put all your utility methods (like parsing or resolving) inside Helper class Put all Shaastra URLs inside ShaastraWeb class (would be much easier to change later)
— Reply to this email directly or view it on GitHub https://github.com/ShaastraWebops/WindowsApp/issues/8.
If you want to recover some files, do a checkout. Why would you push it to master? I am pushing the HEAD to @blackViking007 latest commit. Please add your code after that.
@etchandgear Dont git pull immediately. Make a backup of your existing commits. The current master doesnt have your code.
@etchandgear Can you put all your stuff within Events folder? It is too messy to have all the pages on root folder.
Okay.
On Wed, Oct 7, 2015 at 5:54 PM, Karthik Nishanth notifications@github.com wrote:
@etchandgear https://github.com/etchandgear Can you put all your stuff within Events folder? It is too messy to have all the pages on root folder.
— Reply to this email directly or view it on GitHub https://github.com/ShaastraWebops/WindowsApp/issues/8#issuecomment-146180628 .
Should I turn off the "Commit changes after merge.." option? I did a sync, after making necessary changes(moving files to EventDescription folder) and making a commit. But all other files seem to have disappeared(I mean work from other commits)! Sorry for all the trouble. We'll sort it out at the meeting.
On Wed, Oct 7, 2015 at 7:06 PM, Angom Geetchandra spiker.08s@gmail.com wrote:
Okay.
On Wed, Oct 7, 2015 at 5:54 PM, Karthik Nishanth <notifications@github.com
wrote:
@etchandgear https://github.com/etchandgear Can you put all your stuff within Events folder? It is too messy to have all the pages on root folder.
— Reply to this email directly or view it on GitHub https://github.com/ShaastraWebops/WindowsApp/issues/8#issuecomment-146180628 .
Right now only my work is there. Is it possible for you guys to push it again, so that everyone's work will be there? I'm having a severe cold, and feeling feverish. I won't be coming for the meeting, if that's okay.
On Wed, Oct 7, 2015 at 7:44 PM, Angom Geetchandra spiker.08s@gmail.com wrote:
Should I turn off the "Commit changes after merge.." option? I did a sync, after making necessary changes(moving files to EventDescription folder) and making a commit. But all other files seem to have disappeared(I mean work from other commits)! Sorry for all the trouble. We'll sort it out at the meeting.
On Wed, Oct 7, 2015 at 7:06 PM, Angom Geetchandra spiker.08s@gmail.com wrote:
Okay.
On Wed, Oct 7, 2015 at 5:54 PM, Karthik Nishanth < notifications@github.com> wrote:
@etchandgear https://github.com/etchandgear Can you put all your stuff within Events folder? It is too messy to have all the pages on root folder.
— Reply to this email directly or view it on GitHub https://github.com/ShaastraWebops/WindowsApp/issues/8#issuecomment-146180628 .
It is hard to update two devs' code because of your commit. I am going to revert your change. Also, Please dont sync. Use git command line tool or pull first, then make changes then push. Put your events description inside events folder that I made already
Clone the repo, then put your changes.
Alright. Thanks man.
On Wed, Oct 7, 2015 at 9:07 PM, Karthik Nishanth notifications@github.com wrote:
Clone the repo, then put your changes.
— Reply to this email directly or view it on GitHub https://github.com/ShaastraWebops/WindowsApp/issues/8#issuecomment-146236302 .
I am creating a new branch called dev. We will push unstable code to this, and stable ones to master
Use "git checkout dev" to use the development branch "dev". Push stable code to master
Please create folders for your own modules. Put all your utility methods (like parsing or resolving) inside Helper class Put all Shaastra URLs inside ShaastraWeb class (would be much easier to change later)