The following warnings occurred:
Warning [2] Undefined array key "lockoutexpiry" - Line: 94 - File: global.php PHP 8.1.31 (Linux)
File Line Function
/global.php 94 errorHandler->error
/showthread.php 28 require_once
Warning [2] Undefined array key "lockoutexpiry" - Line: 573 - File: global.php PHP 8.1.31 (Linux)
File Line Function
/global.php 573 errorHandler->error
/showthread.php 28 require_once
Warning [2] Undefined variable $can_access_moderationqueue - Line: 752 - File: global.php PHP 8.1.31 (Linux)
File Line Function
/global.php 752 errorHandler->error
/showthread.php 28 require_once
Warning [2] Undefined array key "avatartype" - Line: 892 - File: global.php PHP 8.1.31 (Linux)
File Line Function
/global.php 892 errorHandler->error
/showthread.php 28 require_once
Warning [2] Undefined array key "avatartype" - Line: 892 - File: global.php PHP 8.1.31 (Linux)
File Line Function
/global.php 892 errorHandler->error
/showthread.php 28 require_once
Warning [2] Undefined variable $awaitingusers - Line: 34 - File: global.php(959) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/global.php(959) : eval()'d code 34 errorHandler->error
/global.php 959 eval
/showthread.php 28 require_once
Warning [2] Undefined array key "style" - Line: 1024 - File: global.php PHP 8.1.31 (Linux)
File Line Function
/global.php 1024 errorHandler->error
/showthread.php 28 require_once
Warning [2] Undefined property: MyLanguage::$lang_select_default - Line: 5308 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 5308 errorHandler->error
/global.php 1024 build_theme_select
/showthread.php 28 require_once
Warning [2] Undefined array key 1 - Line: 1474 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 1474 errorHandler->error
/inc/functions.php 1429 fetch_forum_permissions
/showthread.php 103 forum_permissions
Warning [2] Undefined array key 1 - Line: 1474 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 1474 errorHandler->error
/inc/functions.php 1439 fetch_forum_permissions
/inc/functions.php 3077 forum_permissions
/showthread.php 661 build_forum_jump
Warning [2] Undefined array key 1 - Line: 1474 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 1474 errorHandler->error
/inc/functions.php 1439 fetch_forum_permissions
/inc/functions.php 3077 forum_permissions
/showthread.php 661 build_forum_jump
Warning [2] Undefined array key 1 - Line: 1474 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 1474 errorHandler->error
/inc/functions.php 1439 fetch_forum_permissions
/inc/functions.php 3077 forum_permissions
/showthread.php 661 build_forum_jump
Warning [2] Undefined array key 1 - Line: 1474 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 1474 errorHandler->error
/inc/functions.php 1439 fetch_forum_permissions
/inc/functions.php 3077 forum_permissions
/showthread.php 661 build_forum_jump
Warning [2] Undefined array key 1 - Line: 1474 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 1474 errorHandler->error
/inc/functions.php 1439 fetch_forum_permissions
/inc/functions.php 3077 forum_permissions
/showthread.php 661 build_forum_jump
Warning [2] Undefined array key 1 - Line: 1474 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 1474 errorHandler->error
/inc/functions.php 1439 fetch_forum_permissions
/inc/functions.php 3077 forum_permissions
/showthread.php 661 build_forum_jump
Warning [2] Undefined array key 1 - Line: 1474 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 1474 errorHandler->error
/inc/functions.php 1439 fetch_forum_permissions
/inc/functions.php 3077 forum_permissions
/showthread.php 661 build_forum_jump
Warning [2] Undefined array key "mybb" - Line: 2121 - File: inc/functions.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions.php 2121 errorHandler->error
/inc/functions_indicators.php 41 my_set_array_cookie
/showthread.php 669 mark_thread_read
Warning [2] Undefined variable $postsdone - Line: 906 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 906 errorHandler->error
Warning [2] Undefined array key 11750 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11756 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11763 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11775 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11776 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11777 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11778 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11779 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11780 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11782 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11783 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11785 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11786 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11787 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11791 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11793 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11795 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11818 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11819 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11827 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11869 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11874 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11903 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11928 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11932 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11951 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 12096 - Line: 912 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 912 errorHandler->error
Warning [2] Undefined array key 11750 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11756 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11763 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11775 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11776 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11777 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11778 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11779 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11780 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11782 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11783 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11785 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11786 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11787 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11791 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11793 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11795 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11818 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11819 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11827 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11869 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11874 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11903 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11928 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11932 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 11951 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key 12096 - Line: 1643 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1643 errorHandler->error
/showthread.php 924 buildtree
Warning [2] Undefined array key "profilefield" - Line: 6 - File: inc/functions_post.php(484) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/inc/functions_post.php(484) : eval()'d code 6 errorHandler->error
/inc/functions_post.php 484 eval
/showthread.php 925 build_postbit
Warning [2] Undefined array key "canonlyreplyownthreads" - Line: 672 - File: inc/functions_post.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions_post.php 672 errorHandler->error
/showthread.php 925 build_postbit
Warning [2] Undefined array key "showimages" - Line: 768 - File: inc/functions_post.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions_post.php 768 errorHandler->error
/showthread.php 925 build_postbit
Warning [2] Undefined array key "showvideos" - Line: 773 - File: inc/functions_post.php PHP 8.1.31 (Linux)
File Line Function
/inc/functions_post.php 773 errorHandler->error
/showthread.php 925 build_postbit
Warning [2] Undefined array key "posttime" - Line: 9 - File: inc/functions_post.php(906) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/inc/functions_post.php(906) : eval()'d code 9 errorHandler->error
/inc/functions_post.php 906 eval
/showthread.php 925 build_postbit
Warning [2] Undefined array key "avatar_padding" - Line: 19 - File: inc/functions_post.php(906) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/inc/functions_post.php(906) : eval()'d code 19 errorHandler->error
/inc/functions_post.php 906 eval
/showthread.php 925 build_postbit
Warning [2] Undefined array key "invisible" - Line: 1568 - File: showthread.php PHP 8.1.31 (Linux)
File Line Function
/showthread.php 1568 errorHandler->error
Warning [2] Undefined variable $threadnotesbox - Line: 33 - File: showthread.php(1600) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/showthread.php(1600) : eval()'d code 33 errorHandler->error
/showthread.php 1600 eval
Warning [2] Undefined variable $multipage - Line: 36 - File: showthread.php(1600) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/showthread.php(1600) : eval()'d code 36 errorHandler->error
/showthread.php 1600 eval
Warning [2] Undefined variable $multipage - Line: 68 - File: showthread.php(1600) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/showthread.php(1600) : eval()'d code 68 errorHandler->error
/showthread.php 1600 eval
Warning [2] Undefined variable $addremovesubscription - Line: 82 - File: showthread.php(1600) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/showthread.php(1600) : eval()'d code 82 errorHandler->error
/showthread.php 1600 eval
Warning [2] Undefined variable $thread_deleted - Line: 104 - File: showthread.php(1600) : eval()'d code PHP 8.1.31 (Linux)
File Line Function
/showthread.php(1600) : eval()'d code 104 errorHandler->error
/showthread.php 1600 eval




Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Distributed version control systems (DVCS)
12-13-2010, 07:31 AM,
#6
 
I'd say that workflow is over-complicated, at least for git.

Firstly, it's never necessary to keep a local branch of a mainline development tree that you don't touch, because git keeps track of remote branches at the same level as it does local branches. So instead of having remote master (read-only) > remote master (read-write) <> local master <> local topic1..n you can have something like remote master (read-only) > remote master (read-write) <> local topic1..n -- If you want to test the remote master without your changes, you can commit your current changes to your local branch and checkout the remote branch or master directly (into what git refers to as a "detached HEAD"). Similarly you can compare remote and local branches directly using eg. 'git diff'. This won't cost you any extra bandwidth, when you want to get a new copy of the remote branches, you can do so without affecting any local branch whatsoever.

Another thing to note is that superfluous use of rebase is not generally recommended. The reason for this is that what a rebase actually does is it rewrites the history of your local branch so that all of your local changes appear to happen after any remote changes that occurred, and if there are confliciting changes, ie. you and another developer working on the same region of a file, it quickly becomes difficult to recognise where the conflicts were resolved. Rebasing is primarily useful for branches where you pull the remote branch, perform and commit all your changes, get any updates from the remote one time, fix any conflicts, submit a pull request, and never touch that branch again. If you are performing a lot of changes to one branch over time, merging the remote branch in at frequent intervals and fixing merge conflicts along the way gives a clear indication of what had to be changed at what point, reducing the amount of work that has to be done when your branch is merged back into the main development tree.

On a bit of a tangent here, I'd also recommend against creating a fork using github's tools until you're ready to push some changes to it. Git can easily handle multiple remotes, allowing a mix of read-only and writable, and this also makes it easier to avoid having redundant copies of the master branch on your git remote. This is an almost entirely different workflow, though.
Reply


Messages In This Thread
[No subject] - by fudje - 12-12-2010, 10:04 AM
[No subject] - by joevenzon_phpbb2_import3 - 12-12-2010, 02:52 PM
[No subject] - by thelusiv - 12-13-2010, 06:34 AM
[No subject] - by thelusiv - 12-13-2010, 07:06 AM
[No subject] - by fudje - 12-13-2010, 07:31 AM
[No subject] - by fudje - 12-13-2010, 08:22 AM
[No subject] - by thelusiv - 12-13-2010, 07:06 PM
[No subject] - by thelusiv - 12-13-2010, 07:09 PM
[No subject] - by NaN - 12-13-2010, 09:03 PM
[No subject] - by fudje - 12-13-2010, 09:08 PM
[No subject] - by NaN - 12-13-2010, 09:31 PM
[No subject] - by thelusiv - 12-13-2010, 10:01 PM
[No subject] - by NaN - 12-13-2010, 10:14 PM
[No subject] - by fudje - 12-13-2010, 11:28 PM
[No subject] - by joevenzon_phpbb2_import3 - 12-14-2010, 12:03 AM
[No subject] - by fudje - 12-14-2010, 05:01 AM
[No subject] - by fudje - 12-16-2010, 02:31 AM
[No subject] - by thelusiv - 12-16-2010, 10:38 AM
[No subject] - by fudje - 12-16-2010, 05:26 PM
[No subject] - by joevenzon_phpbb2_import3 - 12-17-2010, 11:16 AM
[No subject] - by thelusiv - 12-17-2010, 11:45 AM
[No subject] - by fudje - 12-21-2010, 12:06 AM
[No subject] - by thelusiv - 12-23-2010, 10:59 AM
[No subject] - by fudje - 12-23-2010, 12:00 PM
[No subject] - by thelusiv - 12-24-2010, 12:02 PM
[No subject] - by fudje - 01-17-2011, 09:03 PM

Forum Jump:


Users browsing this thread: 1 Guest(s)