Databases
StackOverflow2013
Postsdbo
POHow manage Rails log/development.log with Git(Hub) and multiple users
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow manage Rails log/development.log with Git(Hub) and multiple users
    primarykey
    data
    text
    <p>I am newish to Rails and GitHub and struggling with managing two coders' development logs. Specifically:</p> <ol> <li>How do I merge two developers development logs? </li> <li>Can I automate their merger? Or can I differentiate them in some Railsy or GitHub Flowy way?</li> </ol> <p>The Rails app I am developing on command line CentOS 6 is being worked on by another developer. We are using a private GitHub repo to help us manage our codebase and are trying to follow <a href="http://scottchacon.com/2011/08/31/github-flow.html" rel="nofollow">The GitHub Flow</a>. </p> <p>This strategy works well for almost every aspect of our project. The only major problem I've run into with this so far is that our development logs are (of course) out of sync. For instance, he branches from master, then I do. Then he merges to master, then I do, but my merge will fail, citing the automatic merge failure on log/develoment.log. Our logs will be structured like this:</p> <p><em>log/development.log - mine</em> <br /> Shared: (Tens of thousands of lines of code from master branch point) <br /> Not: (Thousands of lines of code unique to my branch)</p> <p><em>log/development.log - his</em> <br /> Shared: (Tens of thousands of lines of code from master branch point) <br /> Not: (Thousands of lines of code unique to his branch)</p> <p>So, I find going through this manually, even with diff tools like <code>git mergetool</code>, impractical because of the volumes of code involved. (Am I simply too much of a vim novice to be able to put this to good use? Do others find this trivial?)</p> <ol> <li>Is there a git or rails development strategy we can employ to keep these files without them clashing? (ex: some tinkering with Rails configuration to designate 'Development1' environment vs. 'Development2' environment)?</li> <li>Is there some command line tool that merges two clashing logs based on time last updated? I'm imaging a tool that, given two clashing git-tracked documents can merge them by comparing the branch point/time, using that as the 'shared' base and adding in the remainder based on which was more recently updated (more recent > appended last). A more advanced version would walk back through commit history to append updates based on commit timestamps.</li> </ol>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USSam
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. COshould belong to your gitignore...
      singulars
      1. POHow manage Rails log/development.log with Git(Hub) and multiple users
      1. USapneadiving
    2. COseek inspiration here: https://github.com/github/gitignore/blob/master/Rails.gitignore
      singulars
      1. POHow manage Rails log/development.log with Git(Hub) and multiple users
      1. USapneadiving
    3. COOK, so I'll take it as the standard that this should be part of the `.gitignore`. (Honestly, I should have thought of this: I never reference it...) And thanks for the link. Can you answer: What is the primary purpose of the development log? I guess I assumed it was meant to be a communal dev data change log ... Also, if you want to answer this (instead of commenting) I can accept it.
      singulars
      1. POHow manage Rails log/development.log with Git(Hub) and multiple users
      1. USSam
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload