git - How to correctly use GitHub -


i have private (paid) github repository enables me have 5 total amount of repositories in (basic account)

i have created repository, in have created master, dev, , vs1, vs2, vs3 branch

the idea (mine idea) is:

master should "base" code of custom theme, base code shared (and same) on branches

dev branch, develop , test master, if good, commit master.

vs1, vs2 , vs3 more developed (advanced) versions of master theme. specify, versions of master theme more functionality, different options, etc. of course, each vs, has dev, thats not matter now.

problem is:

let's assume, change file structure in dev(of master), remove files, , add files (or folders) commit master. master has newly added changes, still keeps older (removed in dev) files+folders in it!

how can "sync" master properly, files got removed in dev removed in master?

and second issue, since share code across branches, how can simultaneously sync dev, master, , vs1, vs2, vs3 "updated" changes make in dev? (but of course, changes, not removing additional folders have in vs1, vs2, or vs3)

let's assume have bug in base code (master), fix in dev, commit master.

i of course need update other branches too, since needing update.

the main issue is, committing seems add new data, not remove obsolete folders , files!

i searched long , far in doc, somehow confused should proceed!

should create different repositories , update each one, after removing not anymore needed files, or there faster and, lets honest, more effective way achieve this?

writing this, thought of "branching" each file+folder shared across versions, makes mess bigger!


Comments

Post a Comment

Popular posts from this blog

java - Spring Data JPA: Why findOne(id) executing delete query internally? -

i have 1 application using @manytomany annotation link 2 different entities 1 parent entity. not sure if have implemented properly. when execute .findone() on parent entity's repository find it, @ first fetch data along executing delete queries internally delete record mapping table (a table jpa creates after adding @manytomany annotation.). following generated sql queries , code snippet: java class @entity @table(name = "inventory") public class inventory { @id long id; // many other properties @manytomany(fetch=fetchtype.lazy) private list<stream> streams; @manytomany(fetch=fetchtype.lazy) private list<subject> subjects; } there no other annotation i've put in stream , subject entity class link inventory class. when run app, create following tables: inventory stream subject inventory_stream inventory_subject (inventory_stream , inventory_subject, 2 tables created automatically, don't k...
Read more

python - Mongodb How to add addtional information when aggregating? -

i beginner , wrote line pipeline works, wanna add other information output, screen name , or number of tweets.i tried add under $group gave me syntax error everytime here pipeline: def make_pipeline(): # complete aggregation pipeline pipeline = [ { '$match': { "user.statuses_count": {"$gt":99 }, "user.time_zone": "brasilia" } }, { "$group": { "_id": "$user.id", "followers": { "$max": "$user.followers_count" } } }, { "$sort": { "followers": -1 } }, { "$limit" : 1 } ]; i using on example : { "_id" : objectid("5304e2e3cc9e684aa98bef97"), "text" : "first week of school on :p", "in_reply_to_status_id" : null, "retweet_count" : null, ...
Read more

java - Incorrect order of records in M-M relationship in hibernate -

Image
i have 4 records in bridge table in mysql database. using @manytomany in hibernate, accurate order of employees incorrect incorrect of projects. following required material figure out doing mistake. this source. @entity @table(name="project") public class projectbean { @id @generatedvalue @column(name="project_id") private int projectid; @column(name="title") private string projecttitle; @manytomany(mappedby="projects") private collection<employeebean> employees; public projectbean() { employees = new arraylist<employeebean>(); } //getters & setters } @entity @table(name="employee") public class employeebean { @id @generatedvalue @column(name="employee_id") private int employee_id; @column(name="first_name") private string ...
Read more